From: Peter Michael Green <plugwash@raspbian.org>
Date: Sat, 12 Oct 2019 13:53:52 +0000 (+0000)
Subject: Commit Debian 3.0 (quilt) metadata (manually cleaned up)
X-Git-Tag: archive/raspbian/1%10.0.0-1+rpi1^2~7
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=a7970e0ab5b79048017cb52027ebc3ddaa09d9f7;p=llvm-toolchain-10.git

Commit Debian 3.0 (quilt) metadata (manually cleaned up)

[dgit (9.9) quilt-fixup]
---

diff --git a/debian/patches/raspbian-triplet.patch b/debian/patches/raspbian-triplet.patch
new file mode 100644
index 000000000..02c93a08a
--- /dev/null
+++ b/debian/patches/raspbian-triplet.patch
@@ -0,0 +1,32 @@
+hack to replace arm version in triplet returned by config.guess
+with the one we want for raspbian.
+
+--- /dev/null
++++ llvm-toolchain-9-9/cmake/config.guess.hack
+@@ -0,0 +1,2 @@
++#!/bin/bash -e
++$(dirname "$0")/config.guess | sed -r s/arm[a-zA-Z0-9]*/armv6/
+--- llvm-toolchain-9-9.orig/cmake/modules/GetHostTriple.cmake
++++ llvm-toolchain-9-9/cmake/modules/GetHostTriple.cmake
+@@ -18,7 +18,7 @@ function( get_host_triple var )
+     if(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows AND NOT MSYS)
+       message(WARNING "unable to determine host target triple")
+     else()
+-      set(config_guess ${LLVM_MAIN_SRC_DIR}/cmake/config.guess)
++      set(config_guess ${LLVM_MAIN_SRC_DIR}/cmake/config.guess.hack)
+       execute_process(COMMAND sh ${config_guess}
+         RESULT_VARIABLE TT_RV
+         OUTPUT_VARIABLE TT_OUT
+--- llvm-toolchain-9-9.orig/compiler-rt/cmake/base-config-ix.cmake
++++ llvm-toolchain-9-9/compiler-rt/cmake/base-config-ix.cmake
+@@ -203,8 +203,8 @@ macro(test_targets)
+       if(WIN32)
+         test_target_arch(arm "" "" "")
+       else()
+-        test_target_arch(arm "" "-march=armv7-a" "-mfloat-abi=soft")
+-        test_target_arch(armhf "" "-march=armv7-a" "-mfloat-abi=hard")
++        test_target_arch(arm "" "" "-mfloat-abi=soft")
++        test_target_arch(armhf "" "" "-mfloat-abi=hard")
+         test_target_arch(armv6m "" "-march=armv6m" "-mfloat-abi=soft")
+       endif()
+     elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "aarch32")
diff --git a/debian/patches/series b/debian/patches/series
index 4b2f3e78b..d57fe871c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -131,3 +131,5 @@ clang-riscv64-rv64gc.diff
 
 #try-to-unbreak-thinlto.diff
 D67877.patch
+
+raspbian-triplet.patch